avoid our own deprecated public API and use

2008-08-04  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkfontsel.c (gtk_font_selection_dialog_get_font):
	avoid our own deprecated public API and use
	gtk_font_selection_get_font_internal() instead of
	gtk_font_selection_get_font().

	(gtk_font_selection_get_font)
	(gtk_font_selection_dialog_get_font): Add missing
	"Deprecated: 2.0" to the api doc comments.

svn path=/trunk/; revision=20962

diff --git a/ChangeLog b/ChangeLog
index c4d5b56dc58175f8a45cdcb2c478dd0bb4387d56..3a5ae3cc90647486467c54856808116f3c908454 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-08-04  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_font):
+       avoid our own deprecated public API and use
+       gtk_font_selection_get_font_internal() instead of
+       gtk_font_selection_get_font().
+
+       (gtk_font_selection_get_font)
+       (gtk_font_selection_dialog_get_font): Add missing
+       "Deprecated: 2.0" to the api doc comments.
+
 2008-08-04  Michael Natterer  <mitch@imendio.com>
 
        * gdk/tests/Makefile.am: add the generated PNGs to CLEANFILES.

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 97dbcab908d9c09e7261d1fa68ce92e351134555..a4a81410255f106c990708f85b7a4ee8eece6a50 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1314,14 +1314,16 @@ gtk_font_selection_get_size (GtkFontSelection *fontsel)
 /**
  * gtk_font_selection_get_font:
  * @fontsel: a #GtkFontSelection
- * 
- * Return value: A #GdkFont.  
+ *
+ * Return value: A #GdkFont.
+ *
+ * Deprecated: 2.0: Use gtk_font_selection_get_font_name() instead.
  **/
 GdkFont *
 gtk_font_selection_get_font (GtkFontSelection *fontsel)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
-  
+
   return gtk_font_selection_get_font_internal (fontsel);
 }
 
@@ -1709,13 +1711,15 @@ gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd)
  *
  * Return value: the #GdkFont from the #GtkFontSelection for the
  * currently selected font in the dialog.
+ *
+ * Deprecated: 2.0: Use gtk_font_selection_dialog_get_font_name() instead.
  */
 GdkFont*
 gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd)
 {
   g_return_val_if_fail (GTK_IS_FONT_SELECTION_DIALOG (fsd), NULL);
 
-  return gtk_font_selection_get_font (GTK_FONT_SELECTION (fsd->fontsel));
+  return gtk_font_selection_get_font_internal (GTK_FONT_SELECTION (fsd->fontsel));
 }
 
 /**